Created by: sfraczek

@Sand3r- please check if it works this time! And maybe we could discuss if we could add a test to this.