Really fixes #5 ;D