Commited bugfix by George