Fix for scram handling