Fix fault

New one
Merge pull request #493 from AClavijo/patch-3

Fix fault