Intends to fix #30