Fix issue with script fields