Fixes Issue #99

Updates spec to be in line with current controller implementation.