Temporary fix for twpwd