Added buggfix 1
Added buggfix 2