#88 fix