Make Bay more fail proof