Thanks to Igor Kovalenko for a bugfix.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>