Fixed persistent bug