Fixes #3
Fixes #4 for 3.x