Fixed pull 4510, this should work.