Fixed: #30
Truly fixed: #27