additonal bug fix