fix #234 - seems to be working