Fix #266
minutiae
Undo #266 fix
Merge pull request #271 from dubslow/master

minutiae