Fixed major bug in response