Fix #24, take three