fixes AEROGEAR-1360 and AEROGEAR-1361