fixed mockup - fixes #644