Really fixes #6 (which is closed accidentaly instead of #2). So fixed #2