Fixed #15 again, because fix was overridedby others