fix #407 by removing an optimization