fixed second part...

thanks to @bwoebi