Aerogear 1453

fixed issue 1453