Fixed issues with custom locations