Speed up compilation on R16B

Should fix Bug #43