Issue fix test fix #24