Temp fix for issue #2, may cause collision issues