partial Fixes #4