fixes AEROGEAR-611