Created by: Mogge
Due to missing automated tests, we merged a small bug into master. Here is the fix.