Fixing pause issue