Bug fix for beach