Laszlos stuff fixed, finally