.. now works properly