Fully resolve #24