Important changes. Again. Fixed #2