fixes #440
fixes #437, fixes #436