#124 has been resolved