Resolve ticket #13