#88 Seems to be fixed