Fix for issue #4 - Stall occurs...