DB/Script - fix