Another attempt at evaluation shortcut