Resolve bug that prevented + and - buttons from working sometimes