Towards resolving #59