bug fix

Added very
second fix

added for most users
Hand merge changes