fixes #1053
fixes #1054