Alexandros Vellis: Bugfix