Again fix #354