closes ticket #131