Fix for Andrew

@tmartin357