Fix from @teppokoivula