Bishop, fixes #476