fixed https://issues.reucon.com/browse/AJ-346