This will fix #2 and close #2 again :).