Maybe a fix for double