updated with hack, but it sort of works I guess.