Proper Fixes #317