A fix for last hotfix, ok epic...