Fixed keyword bug, again