Resolving #933
Cleanup #933