updated samples and core files for issue #413