Fix for beaches
Merge pull request #160 from gajdaw/fix-for-beaches

Fix for beaches