Bugfixes

Signed-off-by: Chimaera89 <Kevin.Schmiedel@fh-stralsund.de>