Fix made for missing/incorrect parmeters