Fixed Issue #45 - Reset not finished yet