Fix for set problem