Little fix (doesn't work yet :P)