#39 resolved