Security fix (refs: #318)