fixed previous faulty commit; hopefully it will be ok now