Should resolve #16