Some Fixes for new Fragment(Fixes #238)