Modal bug fixin'