Working on bugfix.