Merge fix

Signed-off-by: Darren <darrenstahl@me4233-pc33.labs.sce.carleton.ca>