amdify core for issue #1