closes #1, fixed to work with new Spock