IN-1.1: Fixed issue with arrays