Potential fix for flipper bug