Fixing forum #47 #49