minor changes, bug fix maybe?