added fix for issue05