Try and fix logic