maso-kisst - Need some kind of fix