Fix for Scotty 0.6.1