Would fix cause of #342
Would fix cause of #342