Fixed again OS compatiblity