Fixing flipper bug