Fixed: #48, #24