fixed some troubles from previous commit