Should resolve #23