Fixed for Appfog