Bugfix?

#328