Yusuf's Workaround