Trying to get rid of that embarassing bug...