fixed expension/closing issues with #2