Sean/fixes 619

Fixes #619 
@corytheboyd, plz review