Yet another bugfix PR