[2.1.x] Fix for issue #61

This pull request fixes issue #61

<!---
@huboard:{"order":48.5,"custom_state":""}
-->