apply fixes for #951

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>