Fixed function map bug