Fix #115

Check and close ASAP