Issue 267

This should solve #267.