fix #309
next version is targeting Sprint 38