Trying to fix something #441:Fixed