Fixed issues introduced with previous commit

Signed-off-by: Monte Goulding <monte@sweattechnologies.com>