trying to fix bug...