re-committed changes due to strange GIT behavior