Fixes #2726, #2729

#2726 #2729 

it werks