changed behavior a bit