updated some stuff for issue #121