Forked from - Possible modal bug