fixing the last pr.
Merge pull request #425 from raistlinthewiz/develop

fixing the last pr.