Fix from CMS (https://github.com/joomla/joomla-cms/commit/6fb99072a6cb6462501f80da21cffc50104c4313)
Merge pull request #24 from wilsonge/patch-1

Fix from CMS