Issue/401 fixes empty ghost issue

Fixes #401