Attempt workaround to signals not being handled

@macumber please try this