update according to @matthiasnoback suggestion