It should no longer be necessary to add this (lines 27-30).