another bugfix. this should do.