#417, #624: Fixed a bite

#14
#15 und #16