Make sure we don't enter  twice

This fixes #725