fix #376 see 472