Fixed a little bug.. Was a quickfix. Dunno if its really a beautiful
solution^^