Fixed to work for live deployment