Should resolve #529