@domoritz' suggested fixes